Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 26 May 2010 22:43:08 +0000 (22:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 26 May 2010 22:43:08 +0000 (22:43 +0000)

Trivial merge